Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 29 Aug 2011 00:43:27 +0000 (17:43 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 29 Aug 2011 00:43:27 +0000 (17:43 -0700)
commitb49403b0d7c347e17b29b5b73c175896d42f3c64
tree788d1f31d84c73917242df148a79b5e00e99fdd7
parentefccdbc04b41affe3c568e82cf0f32618bd2a0a7
parentc94ff3701ce59fa5a7b4b143fea30e50b388816b
Merge from trunk.